Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 21:14:19 +0000 (13:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 19 Dec 2011 21:14:19 +0000 (13:14 -0800)

Trivial merge